Update AGP and dependencies by juangardi21 · Pull Request #19 · Telefonica/android-snaptesting

juangardi21 · 2026-03-27T12:35:45Z

🎟️ Jira ticket

🥅 What's the goal?

Migrate the Gradle plugin from deprecated AGP internal APIs to the modern stable APIs, ensuring compatibility with newer AGP versions.

Before merging this PR, I will create an RC1 and try this new version in other projects

🚧 How do we do it?

Replace TestedExtension with AndroidComponentsExtension + ApplicationAndroidComponentsExtension (new variant API) to resolve applicationId and adb path.
Collect applicationId per variant at configuration time using onVariants {} as a lazy Provider<String>.
Remove all ddmlib usage (IDevice, FileListingService, CollectingOutputReceiver) in DeviceFileManager and replace with direct adb subprocess calls via ProcessBuilder.

📘 Documentation changes?

No docs to update nor create

🧪 How can I test this?

Run the connected Android tests with and without record mode to verify snapshots are pulled and reports are generated correctly.

Compilation	Tests running in SW
Grabacion.de.pantalla.2026-03-30.a.las.16.21.22.mov	Grabacion.de.pantalla.2026-03-30.a.las.16.23.33.mov

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

juangardi21 · 2026-03-30T15:11:18Z

...ld/gradle-plugin/src/main/java/com/telefonica/androidsnaptesting/AndroidSnaptestingPlugin.kt

                throw AndroidSnaptestingNoDeviceProviderInstrumentTestTasksException()
            }

-            val extension = project.extensions.findByType(TestedExtension::class.java)


AGP 9.x removed TestedExtension from the public API. We now use the stable
variant API (AndroidComponentsExtension / ApplicationAndroidComponentsExtension) which is the recommended way to interact with Android build variants since AGP 7.x.

juangardi21 · 2026-03-30T15:22:19Z

...ld/gradle-plugin/src/main/java/com/telefonica/androidsnaptesting/AndroidSnaptestingPlugin.kt

-            .firstOrNull { it.name == deviceProviderTask.variantName }
-            ?: throw RuntimeException("TestVariant not found for ${deviceProviderTask.variantName}")
-        val applicationIdProvider = providerFactory.provider { testedVariant.applicationId }
-        val adbExecutablePath = extension.adbExecutable.absolutePath


adbExecutable was removed from TestedExtension in AGP 9.x.
sdkComponents.adb is the stable replacement: it returns a lazy Provider pointing to the adb binary resolved from the configured SDK.

juangardi21 · 2026-03-30T15:23:41Z

...ude-build/gradle-plugin/src/main/java/com/telefonica/androidsnaptesting/DeviceFileManager.kt

-                it.iDevice.executeShellCommand("rm -rf ${getDeviceAndroidSnaptestingRootAbsolutePath()}", receiver)
-                println(receiver.output)
+            devices.forEach { device ->
+                runAdb(device.serialNumber, "shell", "rm", "-rf", getDeviceAndroidSnaptestingRootAbsolutePath())


Previously used DDMLib's IDevice.executeShellCommand() to run 'rm -rf' on the device. Now delegates to runAdb(), which spawns an 'adb -s shell rm -rf ...' subprocess.

juangardi21 · 2026-03-30T15:24:33Z

...ude-build/gradle-plugin/src/main/java/com/telefonica/androidsnaptesting/DeviceFileManager.kt

-
    private fun getDeviceAndroidSnaptestingRootAbsolutePath(): String =
-        "${FileListingService.DIRECTORY_SDCARD}/Download/android-snaptesting/$applicationId"
+        "/sdcard/Download/android-snaptesting/$applicationId"


FileListingService.DIRECTORY_SDCARD was a DDMLib constant ("/sdcard"). Using the literal string directly removes the DDMLib dependency entirely.

juangardi21 · 2026-03-30T15:26:58Z

...ude-build/gradle-plugin/src/main/java/com/telefonica/androidsnaptesting/DeviceFileManager.kt

        destinationPath: String,
    ) {
-        val fileEntry = getDeviceAndroidSnaptestingSubfolderAbsolutePath(androidSnaptestingSubFolderInDevice).toFileEntry()
+        val remotePath = getDeviceAndroidSnaptestingSubfolderAbsolutePath(androidSnaptestingSubFolderInDevice)


The old implementation built a FileEntry tree using DDMLib's FileListingService and then called IDevice.pullFile() for each entry.
The new implementation runs adb shell ls <remotePath> to list files and
adb pull <remote> <local> for each one, filtering out error lines from ls in case the folder doesn't exist yet on the device.

juangardi21 · 2026-03-30T15:27:58Z

...ude-build/gradle-plugin/src/main/java/com/telefonica/androidsnaptesting/DeviceFileManager.kt

+        println(output)
+    }
+
+    private fun runAdbCapture(serial: String, vararg args: String): String {


runAdbCapture spawns a subprocess with the adb binary, targeting a specific device by serial (-s flag), merges stderr into stdout, and waits up to 60 seconds.

I would probably consider adding error handling for ADB command failures (e.g., check exit codes, handle timeouts, log errors) to improve robustness.”
Perhaps something like:

private fun runAdbCapture( serial: String, vararg args: String, throwOnError: Boolean = false ): AdbResult { val command = buildList { add(adbExecutablePath) add("-s") add(serial) addAll(args.toList()) } try { val process = ProcessBuilder(command) .redirectErrorStream(false) .start() val output = process.inputStream.bufferedReader().readText() val error = process.errorStream.bufferedReader().readText() val finished = process.waitFor(60, TimeUnit.SECONDS) val exitCode = process.exitValue() if (!finished || exitCode != 0) { val message = "ADB command failed: ${command.joinToString(" ")}\nExit code: $exitCode\nOutput: $output\nError: $error" if (throwOnError) throw RuntimeException(message) else println(message) } return AdbResult(output, error, exitCode) } catch (e: Exception) { val message = "Exception running ADB command: ${command.joinToString(" ")}\n${e.message}" if (throwOnError) throw RuntimeException(message, e) else println(message) return AdbResult("", e.message ?: "", -1) } } private data class AdbResult(val output: String, val error: String, val exitCode: Int)

And then using it as: val result = runAdbCapture(serial, *args, throwOnError = true) in runAdb

juangardi21 · 2026-03-30T15:28:35Z

...ude-build/gradle-plugin/src/main/java/com/telefonica/androidsnaptesting/DeviceFileManager.kt

-    ) {
-        device.fileListingService.getChildrenSync(androidSnaptestingDeviceFolder).forEach {
-            device.pullFile(it.fullPath, "$destinationPath/${it.name}")
+    private fun runAdb(serial: String, vararg args: String) {


Convenience wrapper that additionally prints the output to the Gradle log. Both replace the DDMLib IDevice shell/pull APIs removed in AGP 9.x.

jeprubio

Great! 🚀

jeprubio · 2026-03-31T09:56:28Z

...ld/gradle-plugin/src/main/java/com/telefonica/androidsnaptesting/AndroidSnaptestingPlugin.kt

+
+        project.extensions.findByType(ApplicationAndroidComponentsExtension::class.java)
+            ?.onVariants { variant ->
+                // variant.name == "debug" → test task variant name == "debugAndroidTest"


is this comment in the code necessary?

jeprubio · 2026-03-31T10:12:10Z

...ude-build/gradle-plugin/src/main/java/com/telefonica/androidsnaptesting/DeviceFileManager.kt

+        println(output)
+    }
+
+    private fun runAdbCapture(serial: String, vararg args: String): String {


I would probably consider adding error handling for ADB command failures (e.g., check exit codes, handle timeouts, log errors) to improve robustness.”
Perhaps something like:

private fun runAdbCapture( serial: String, vararg args: String, throwOnError: Boolean = false ): AdbResult { val command = buildList { add(adbExecutablePath) add("-s") add(serial) addAll(args.toList()) } try { val process = ProcessBuilder(command) .redirectErrorStream(false) .start() val output = process.inputStream.bufferedReader().readText() val error = process.errorStream.bufferedReader().readText() val finished = process.waitFor(60, TimeUnit.SECONDS) val exitCode = process.exitValue() if (!finished || exitCode != 0) { val message = "ADB command failed: ${command.joinToString(" ")}\nExit code: $exitCode\nOutput: $output\nError: $error" if (throwOnError) throw RuntimeException(message) else println(message) } return AdbResult(output, error, exitCode) } catch (e: Exception) { val message = "Exception running ADB command: ${command.joinToString(" ")}\n${e.message}" if (throwOnError) throw RuntimeException(message, e) else println(message) return AdbResult("", e.message ?: "", -1) } } private data class AdbResult(val output: String, val error: String, val exitCode: Int)

And then using it as: val result = runAdbCapture(serial, *args, throwOnError = true) in runAdb

jeprubio · 2026-03-31T10:14:32Z

gradle.properties

-# resources declared in the library itself and none from the library's dependencies,
-# thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
+# Non-transitive R classes are the default in AGP 9.x and above


Is this comment necessary?

jeslat · 2026-03-31T12:52:54Z

...ld/gradle-plugin/src/main/java/com/telefonica/androidsnaptesting/AndroidSnaptestingPlugin.kt

+        // Collect applicationId per test-variant name at configuration time using the new variant API.
+        // onVariants runs during project configuration, before afterEvaluate.


In my opinion, this comment is more of a PR comment than a comment that should be in the code.

Update AGP and dependencies

4e4bf94

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

juangardi21 commented Mar 30, 2026

View reviewed changes

Remove deprecated common library dependency

4b0deab

juangardi21 requested review from jeprubio and jeslat March 31, 2026 09:52

jeprubio approved these changes Mar 31, 2026

View reviewed changes

jeslat reviewed Mar 31, 2026

View reviewed changes

		// Collect applicationId per test-variant name at configuration time using the new variant API.
		// onVariants runs during project configuration, before afterEvaluate.

Conversation

juangardi21 commented Mar 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🎟️ Jira ticket

🥅 What's the goal?

🚧 How do we do it?

📘 Documentation changes?

🧪 How can I test this?

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jeprubio Mar 31, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jeprubio left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jeprubio Mar 31, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

juangardi21 commented Mar 27, 2026 •

edited

Loading

jeprubio Mar 31, 2026 •

edited

Loading

jeprubio Mar 31, 2026 •

edited

Loading